Update callers from immediateCommit() to commit(). The former's been deprecated a...

diff --git a/includes/Article.php b/includes/Article.php
index 20c01c7..6209041 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -1509,7 +1509,7 @@ class Article {
                if( $wgUseSquid ) {
                        // Commit the transaction before the purge is sent
                        $dbw = wfGetDB( DB_MASTER );
-                       $dbw->immediateCommit();
+                       $dbw->commit();
 
                        // Send purge
                        $update = SquidUpdate::newSimplePurge( $this->mTitle );

diff --git a/includes/ExternalStoreDB.php b/includes/ExternalStoreDB.php
index c37e706..18aa972 100644 (file)
--- a/includes/ExternalStoreDB.php
+++ b/includes/ExternalStoreDB.php
@@ -140,7 +140,7 @@ class ExternalStoreDB {
                        throw new MWException( __METHOD__.': no insert ID' );
                }
                if ( $dbw->getFlag( DBO_TRX ) ) {
-                       $dbw->immediateCommit();
+                       $dbw->commit();
                }
                return "DB://$cluster/$id";
        }

diff --git a/includes/db/Database.php b/includes/db/Database.php
index 179fba5..36f34a3 100644 (file)
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -1878,7 +1878,7 @@ abstract class DatabaseBase {
 
                # Commit any open transactions
                if ( $this->mTrxLevel ) {
-                       $this->immediateCommit();
+                       $this->commit();
                }
 
                if ( !is_null( $this->mFakeSlaveLag ) ) {

diff --git a/includes/db/DatabaseMssql.php b/includes/db/DatabaseMssql.php
index c5ff676..902eb77 100644 (file)
--- a/includes/db/DatabaseMssql.php
+++ b/includes/db/DatabaseMssql.php
@@ -131,7 +131,7 @@ class DatabaseMssql extends DatabaseBase {
        function close() {
                $this->mOpened = false;
                if ($this->mConn) {
-                       if ($this->trxLevel()) $this->immediateCommit();
+                       if ($this->trxLevel()) $this->commit();
                        return mssql_close($this->mConn);
                } else return true;
        }

diff --git a/includes/db/DatabaseMysql.php b/includes/db/DatabaseMysql.php
index 7087220..d632e42 100644 (file)
--- a/includes/db/DatabaseMysql.php
+++ b/includes/db/DatabaseMysql.php
@@ -129,7 +129,7 @@ class DatabaseMysql extends DatabaseBase {
                $this->mOpened = false;
                if ( $this->mConn ) {
                        if ( $this->trxLevel() ) {
-                               $this->immediateCommit();
+                               $this->commit();
                        }
                        return mysql_close( $this->mConn );
                } else {

diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index d4a2a50..ac21539 100644 (file)
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -79,7 +79,7 @@ class DatabaseSqlite extends DatabaseBase {
        function close() {
                $this->mOpened = false;
                if ( is_object( $this->mConn ) ) {
-                       if ( $this->trxLevel() ) $this->immediateCommit();
+                       if ( $this->trxLevel() ) $this->commit();
                        $this->mConn = null;
                }
                return true;

diff --git a/includes/db/LoadBalancer.php b/includes/db/LoadBalancer.php
index 48065f8..68d142c 100644 (file)
--- a/includes/db/LoadBalancer.php
+++ b/includes/db/LoadBalancer.php
@@ -809,7 +809,7 @@ class LoadBalancer {
                foreach ( $this->mConns as $conns2 ) {
                        foreach ( $conns2 as $conns3 ) {
                                foreach ( $conns3 as $conn ) {
-                                       $conn->immediateCommit();
+                                       $conn->commit();
                                }
                        }
                }

diff --git a/includes/filerepo/LocalFile.php b/includes/filerepo/LocalFile.php
index e0e814f..55c4b17 100644 (file)
--- a/includes/filerepo/LocalFile.php
+++ b/includes/filerepo/LocalFile.php
@@ -937,7 +937,7 @@ class LocalFile extends File
 
                # Commit the transaction now, in case something goes wrong later
                # The most important thing is that files don't get lost, especially archives
-               $dbw->immediateCommit();
+               $dbw->commit();
 
                # Invalidate cache for all pages using this file
                $update = new HTMLCacheUpdate( $this->getTitle(), 'imagelinks' );